Sub:add aux func disarm/estop to pre-arm check for disarm function #29979
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Hwurzburg
changed the title
Williangalvani
approved these changes
May 5, 2025
IamPete1
reviewed
May 5, 2025
IamPete1
reviewed
May 5, 2025
Hwurzburg
force-pushed
the
mode_disarm_check
branch
from
885b9d3 to
1412cb3
Compare
rmackay9
reviewed
May 6, 2025
peterbarker
previously requested changes
May 6, 2025
Hwurzburg
force-pushed
the
mode_disarm_check
branch
from
1412cb3 to
3ef25c0
Compare
Hwurzburg
force-pushed
the
mode_disarm_check
branch
from
3ef25c0 to
03a266a
Compare
|
@peterbarker @rmackay9 please approve so @Williangalvani can merge...thanks |
tridge
reviewed
May 13, 2025
| @@ -48,7 +55,7 @@ bool AP_Arming_Sub::pre_arm_checks(bool display_failure) | |||
| } | |||
| // don't allow arming unless there is a disarm button configured | |||
| if (!has_disarm_function()) { | |||
| check_failed(display_failure, "Must assign a disarm or arm_toggle button"); | |||
| check_failed(display_failure, "Must assign a disarm or arm_toggle button or disarm aux function"); | |||
rmackay9
reviewed
May 13, 2025
| @@ -48,7 +55,7 @@ bool AP_Arming_Sub::pre_arm_checks(bool display_failure) | |||
| } | |||
| // don't allow arming unless there is a disarm button configured | |||
| if (!has_disarm_function()) { | |||
| check_failed(display_failure, "Must assign a disarm or arm_toggle button"); | |||
| check_failed(display_failure, "Must assign a disarm or arm_toggle button or disarm aux function"); | |||
There was a problem hiding this comment.
we could make this shorter, something like, "set RCx_OPTION = yy (Disarm)"
There was a problem hiding this comment.
that is not the correct message.....it could be "Needs a disarm switch or button setup"...I will make another PR if you are really fussed...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
for RC only operation without joystick buttons or just gcs aux function commands